Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump version #731

Merged
merged 1 commit into from
Sep 5, 2024
Merged

Conversation

lucasmz-dev
Copy link
Contributor

No description provided.

lucasmz-dev referenced this pull request Aug 22, 2024
Change-Id: Ida82c6eafa715069d62dc92eb19accf64ed6d51c
@lucasmz-dev
Copy link
Contributor Author

I see some references to the ability to restore data with Seedvault after setup. I'm not sure if this has been merged or not and so I haven't included it. Let me know if I should.

Copy link
Collaborator

@grote grote left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome. Thanks a lot!

I see some references to the ability to restore data with Seedvault after setup. I'm not sure if this has been merged or not and so I haven't included it. Let me know if I should.

This should go in soon. Once #723 is merged. Could already be added to the changelog and we merge this PR afterwards!

cd @chirayudesai

CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
CHANGELOG.md Outdated Show resolved Hide resolved
app/src/main/AndroidManifest.xml Outdated Show resolved Hide resolved
@lucasmz-dev lucasmz-dev marked this pull request as draft August 24, 2024 01:34
@lucasmz-dev lucasmz-dev marked this pull request as ready for review August 24, 2024 01:41
@lucasmz-dev lucasmz-dev changed the title Bump to 14-5.0 - many cool things ^^ Bump version Aug 24, 2024
@lucasmz-dev
Copy link
Contributor Author

This should go in soon. Once #723 is merged. Could already be added to the changelog and we merge this PR afterwards!

My only adversion to this is that it might look weird in git history. The true start of 14-4.1 would be when the merge commit shows up, but the commit for the bump and changelog itself may come before that, which may cause confusion.

Also do you guys not do tags? I see only for like 2021 versions, it makes me a bit confused on whether Seedvault is meant to be merged constantly or based on versions

@grote grote added this to the 3.x milestone Sep 5, 2024
Copy link
Collaborator

@t-m-w t-m-w left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! Version is updated as expected when building with this, in app info and About page.

So I guess the remaining question is when to merge? And then if there are more changes merged before then, update the changelog again?

@grote grote merged commit ff59dec into seedvault-app:android14 Sep 5, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants